Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rewrite releasing scripts for packit compatibility #462

Merged
merged 2 commits into from
Sep 8, 2023
Merged

Rewrite releasing scripts for packit compatibility #462

merged 2 commits into from
Sep 8, 2023

Conversation

mulkieran
Copy link
Member

@mulkieran mulkieran commented Sep 6, 2023 •
edited
Loading

@mulkieran mulkieran self-assigned this Sep 6, 2023
@mulkieran mulkieran force-pushed the dev-release branch 8 times, most recently from 30c7b91 to b53f3f9 Compare September 7, 2023 15:59
This was referenced Sep 7, 2023
Merged
Merged
Merged
@mulkieran mulkieran force-pushed the dev-release branch 5 times, most recently from 45fc948 to c07cc00 Compare September 8, 2023 00:01
@mulkieran
Use dev instead of a number for the release value
129da48 
"77" might not be as visible in a release string as "dev".

Signed-off-by: mulhern <[email protected]>
@mulkieran mulkieran changed the title Use dev instead of a number for the release value Rewrite releasing scripts for packit compatibility Sep 8, 2023
@mulkieran mulkieran marked this pull request as ready for review September 8, 2023 00:42
@bgurney-rh
Copy link
Member

There also seems to be an issue with create_artifacts when no suffix is specified: there is an extra ~ character at the end of the filename of each artifact file. Trying to build a source RPM failed, but I was able to bypass it with these renames in the "SOURCES" directory:

$ mv stratisd-3.6.0~.tar.gz stratisd-3.6.0.tar.gz
$ mv stratisd-3.6.0~-vendor.tar.gz stratisd-3.6.0-vendor.tar.gz
$ mv stratisd-3.6.0-.crate stratisd-3.6.0.crate

That resulted in successful source RPM builds, but I ran into a failure on the untar phase for the crate, because the top level directory in the tar file was named "stratisd-3.6.0~".

bgurney-rh
bgurney-rh approved these changes Sep 8, 2023
View reviewed changes
mockbuild_test/generate_sourcerpms.sh Outdated
sed --in-place -E "s/(^Version.*)${STRATISD_SPEC_VERSION}/\1${STRATISD_SPEC_VERSION}${STRATISD_SUFFIX}/g" SPECS/stratisd.spec
sed --in-place -E "s/(^Version.*)${STRATISCLI_SPEC_VERSION}/\1${STRATISCLI_SPEC_VERSION}${STRATISCLI_SUFFIX}/g" SPECS/stratis-cli.spec
# Remove the "Requires: stratisd" line in stratis-cli.spec.
sed -i "/Requires.*stratisd/d" ../distro/stratis-cli.spec
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of the create_artifacts.py references to the spec files were pointing to the wrong directory level:

On line 69, for stratisd, it should read --specfile-path=../../SPECS/stratisd.spec
On line 72, for stratis-cli, --specfile-path=../../SPECS/stratis-cli.spec

On line 76: sed -i "/Requires.*stratisd/d" SPECS/stratis-cli.spec

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good now.

@mulkieran mulkieran merged commit 3c2ad83 into stratis-storage:master Sep 8, 2023
5 checks passed
@mulkieran mulkieran deleted the dev-release branch September 8, 2023 16:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bgurney-rh bgurney-rh bgurney-rh approved these changes

Assignees

@mulkieran mulkieran

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mulkieran @bgurney-rh